Skip to content

Conversation

@Rafi-Microsoft
Copy link
Contributor

Purpose

  • Introduced a scheduled GitHub Actions workflow to auto-approve and auto-merge Dependabot PRs targeting the dependabotchanges branch.
  • Also optimized the dependabot.yml configuration to group dependency updates by ecosystem and path, significantly reducing PR noise.
  • Enhanced rebase logic to handle merge conflicts using --strategy-option=theirs.
  • Implemented multi-strategy auto-merge (merge, squash, rebase) with fallback handling.
  • Improved overall script reliability and compatibility with repo-level merge restrictions.

Does this introduce a breaking change?

  • Yes
  • No

How to Test

  • Get the code
git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install
  • Test the code

What to Check

Verify that the following are valid

  • ...

Other Information

@Rafi-Microsoft Rafi-Microsoft merged commit f8de0f8 into main May 27, 2025
7 checks passed
@github-actions
Copy link

🎉 This PR is included in version 1.5.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@Rafi-Microsoft Rafi-Microsoft deleted the PSL-DependabotAutoMergeWorkflow branch July 15, 2025 11:28
blessing-msft pushed a commit that referenced this pull request Aug 1, 2025
chore: Updated Dependabot config to group PRs and added workflow for scheduled auto-merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants